chore: sync upstream 2026-08-19 - #56
Merged
Merged
Conversation
…ingdotgg#7082) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…g#7083) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…in GitHubPullRequestCli (pingdotgg#7385) Signed-off-by: aoright <102943475+aoright@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
…pingdotgg#7459) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…t full speed (pingdotgg#7460) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…nt (pingdotgg#6563) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ngdotgg#7477) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…tgg#6286) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
github-actions
Bot
added
vouch:trusted
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges pingdotgg/t3code main (44 commits) into the fork after landing PRs #50-#55.
Conflict resolutions:
Sidebar.tsx: took upstream's newchangeRequestAutoSettles(pr, { autoSettleOnMerge, thread })call, kept the fork's recede-styling comment.ChatComposer.tsx: upstream'sDISCONNECTED_COMPOSER_PLACEHOLDERconstant combined with the fork's prompt-suggestion placeholder fallback.ProjectSettingsPanel.tsx: kept the fork's removal of the project-level default-model row (superseded by provider new-thread defaults from feat: configure provider defaults for new threads #55).settingsSearch.ts/settings.test.ts/settings.ts: both sides' additions kept (fork provider-defaults entries plus upstream browser settings, provider-enabled tests, preview imports).planModeEnableda requiredTraitsPickerprop;ProviderNewThreadDefaultsSectionnow reads it viauseClientSettings.Verified with targeted tests (settings contracts, settings search/panels, composer draft store, draft defaults sync, useHandleNewThread, threadSettled, ThreadSyncStatusPill — all passing) and clean typechecks for web, contracts, shared, client-runtime, and server.
Merged and verified by Claude Fable 5 via Claude Code.